beginning of OCD format cleanup