make code leaner