Clean-up and parameterizing.
Merge pull request #3 from ehelms/cleanup

Clean-up and parameterizing.