refactored alarm services