Code clean up.
Merge pull request #57 from menghong777/master

Code clean up.