Comment simplifier 18/36