Add @Override and spacing, fix onDisable