format and refactorings
update files header
comments and refactorings