net inf refactor