more refactor cleanup