-Wall OCD cleanup