Code Cleaning

*sweep sweep*