Clean verbose
Refactor code and cleaning coms
Merging DOne