Alarm: Fix remarks from code review