lint cleanups
Add missing return