random cleanings and refactorings
cleanings, fixes cheers#toast()