clean up minor ocd code