Refactoring. Simplifying the use the current bucket.