Only modifications to be closer with pep8