PEP 8 + testing...