Cleaned things up a bunch.