Misc cleanups
Merge pull request #1 from uukr/htitle

Misc cleanups