net inf refactor complete