Merge pull request #1199 from src-d/clean-up

*: code quality improvements