Add PEP8 style checker setup (incl. pre-commit hook)
Fixed PEP-8 code style issues
Fixed conflicts.