mostly OCD related cleanup