Cleaning and refactoring much?