Refactored Results.
Preparation for unit tests, ongoing...