Reorganise class slightly