Addressed review comments:
- updated source code comments
- dopped "this->"
- removed trailing white spaces
- cleaned up a test case include file
- prefixed member variables with m_ (those that were missing the
  prefix)
- deployed one suggestion to return early from a member function in
  case the call was redundant.