Refactor Bucket.
Merge pull request #51 from benbjohnson/bucket-refactor

Refactor Bucket