Small refactorings.
Small refactorings.

dwillmer/jedi,WoLpH/jedi,dwillmer/jedi,tjwei/jedi,tjwei/jedi,mfussenegger/jedi,WoLpH/jedi,jonashaag/jedi,mfussenegger/jedi,flurischt/jedi,jonashaag/jedi,flurischt/jedi