House Cleaning the code