Code refactoring.
Configuration settings: feedback, byself.
Code refacotring.