Cleaning Up

Slightly less yikes.
Merge pull request #2 from camilleemig/patch-1

Cleaning Up