A little clean up.
Merge pull request #5 from T-Macgnolia/jb-mr2

A little clean up.