more cleanup (our code formatting rules are lame)