Make code leaner