Refactor, clean and added beeps for some events