refactor, add --noref