Add missing return
Cleanup