Merge pull request #1851 from pinterest/1788-indent-fixes

Indent fixes