Some cleanup to make files smaller.
Merge pull request #6 from lambdaide/cleanup

Some cleanup to make files smaller.