cleaned up alert service and controller