tidy
Merge pull request #300 from Incubaid/cfg_cleanup

tidy