remove a few duplicated lines from v. basic refactor