Misc. code review comments and changes
Merge pull request #2 from happy4crazy/post-review

Misc. code review comments and changes