Small code refactor
Canceling alarm. Code refactor
Code refaktor. Push message update