More cleanup
Merge pull request #8 from changbl/working

More cleanup