New results for large task.
Code refactoring and cleanup.