Reorganise class for clarity