Cleanup
Merge pull request #3 from fixwa/cleanup1

Cleanup