[SystemInfo] Fix coding style
[Bookmark] Remove old debug output
Merge pull request #221 from cmarcelo/small-cleanups

Small cleanups