Net refactoring continued