Convert 4 spaces to tabs
utils: Use simpler object notation
Merge pull request #1492 from mc10/style-fixes

Make minor style changes