Cleaning and re-factoring