Reviewed: Minor coding style changes to match ding code
Merge pull request #1 from ding2tal/development

Reviewed: Minor coding style changes to match ding code - APPROVED :-)