cleaned things up a bit