Clean main class + Optimization