One more time refactoring. =)