One more refactoring