Some OCD cleanup