more refactoring/....