OCD Cleaning

Also trying to doc some methods and make sure everything is clear, more
to come