Alarm3.1

Small modification tidy up