Code clean for #187
Fix minor code formatting issues
Merge pull request #194 from OSTraining/code-cleanup-for-187

Code cleanup for #187