BeatHisto edited and other refactored