Cleanup
Adding missing return