Refactor, thanks to pylint :P