tidy up and reorganise