cleaned things up a little