Minor code cleanup
[ADD] Support for manually selecting algorithms to build