Import cleanup, PEP 8 compatible