Small refactor to NG project.