Cleaned some things up.