Reorganise the listener methods