Code refactoring.
Config updated