made code more aerodynamic