OCD Cleaning

Currently working on completion.