Did some stuff to resolve my OCD.