Code cleaning.
Merge pull request #320 from facebook/nekto/code_cleaning

Code cleaning.