more refactor of same