Reorganise slightly