cleaned up code and links.
Merge pull request #21 from mroberge/clean-up

cleaned up code and links.