Changed imports to meet PEP 8