Addressed Douglas issues with imports; Fixed PEP8 violations