Cleanup some lint warnings
Fix unsimplified return values