Edited config file
Edited config file
PEP-8 fixes and code reorginization. No functional changes