Fixes #6589: updated code style guide to mention else after return, adjusted code involved in the issue