Total refactoring of comments, no tested yet, but works