Refactor, clean and added beeps for some events
Merge branch 'RefactorAndBeep'