Fix some coding style by alansaviolobo.
Merge pull request #6 from andytruong/cleanup-code

Fix some coding style by alansaviolobo