Clean up my OCD remnants...