Return type cleanups