more refactor...