Code Cleaning

Sweeping the floor