Issue #22. Refactor Beeper object (enhancement)