Merge pull request #303 from mikeNG/code-style

Make code style consistent