refactored confg system to be more seperated
pep 8
fixed conflict