Alarm working
Cleanup