refactored resultset in flexstore and psr2 issues
refactoring
Updated for scrutinizer issues
Updated scrutinizer
Updated unit tests and scrutinizer
Improved unit tests