Get rid of redundant fields in Bucket instances
Move bucket class to the companion object to remove unnecessary reference to the outer HashSet object