General cleanup
Merge pull request #4 from mbabker/tweaks

General cleanup