Clean up comments in bucket files
Change bucket functions to be static