Cleaned up a lot of BucketController