Cleanup code
Merge pull request #6 from changbl/working

Cleanup code