Reviewed: Minor coding style changes to match ding code
Merge branch 'development'