General cleanup
Merge pull request #136 from yissachar/cleanup

General cleanup