Cleanup #3 and f.return added