Let's stick to CamelCase for now
More pep8 checks and fixes