OCD

Little reorganization to fix my OCD