Cleaning and Fixing ... too lazy too write commits