And a little more cleanup