continuing refactoring with Net class