Commented configuration file
Refactoring