Code Cleaning on main class

Cleaning