Remove make_buckets
Add docstrings