Less variables usage and clean up