Refactoring
Encapsulated results