A little more cleanup (OCD much?)