root directory style cleanup
Merge pull request #1288 from asmacdo/style-cleanup-rootdir

root directory style cleanup
resolve merge conflicts