Fixed wrong import mapping and two PEP8 issues