Code formatting
Merge pull request #302 from yueh/cleanup-code

Code formatting