Add configuration variable
Beautify code
Simplify configuration settings