Added removing nested lambdas to Converter class