Set proper id values on BenchType enum
General refactoring and commenting