cleaned things up just a bit