lots of cleanup
Merge pull request #1 from codepipes/cleanup

lots of cleanup