Removed unnecessary libraries, made more PEP-8y