Code Review Tweaks

See:
https://github.com/GigaOM/gigaom-plugins/pull/2297/files#diff-2ca3a3b88344a8506efdbf5fd24666d7R308