Refactoring (rename events, remove unused usings etc.)