Cleaning project up