Fixes for if/else return logic best practices. 

Thanks dkirker!