Cleaned things up a little bit.