Applied one more refactoring