Code cleanup
Merge pull request #1376 from palantir/codeCleanup

Code cleanup