Net refactor