Merge pull request #74 from mchf/Code-11-SP3

Refactoring candidates for enslaving list creation.