Format and change order of onEnable