cleaned things up a little bit more