Fixed pep8 issues, removed unused import, shortened locator.