New code refactor changes