Doc - Simplify header
Refactor - Improve according to suggestions
Refactor - Improve configuration format