More Cleanup
Merge pull request #3 from kcristiano/kjc-1.2

More Cleanup