Code review fixes:

* https://github.com/misterbisson/bsocial-comments/pull/52#discussion_r17169713
* https://github.com/misterbisson/bsocial-comments/pull/52#discussion_r17172228
* https://github.com/misterbisson/bsocial-comments/pull/52#discussion_r17172778
* https://github.com/misterbisson/bsocial-comments/pull/52#discussion_r17172785
* https://github.com/misterbisson/bsocial-comments/pull/52#discussion_r17172992
* https://github.com/misterbisson/bsocial-comments/pull/52#discussion_r17173323