Cleaned some things up