Refactored some events