NYC refactor