Updating a few things and fixing PEP8