Cleaning code
Cleaning
Fix bug when default configuration used
Cleaning