Cleanup
Add return to enable better testing