Refactor + Move Events