Renamed AlertHistory to AlertManager, wrap more code in classes