General cleanup
Merge pull request #193 from dungpa/cleanup

General cleanup