OCD cleaned up