Changed func name to be more sensible
Refactored and cleaned up alarm model