squash! code-review fixes

Fixed issues found by Ben, wrapped few more long lines.