#27 refactoring at Genetic Search architecture