net-sc: Refactoring