misc refactor hack