Clean up code
Cleaning