refactoring
One more time refactoring.