Rework config options, pep8 for syntax

Clean syntax according to pep8

Rework some config options