Finished refactoring onEnable