Partial fix for handling functions that return lambdas and formatting changes (tabs to spaces)