Cleaned things up a little