several adjustments due to PEP 8