Minor refactoring

formatted bucket toilets