comments, documentation and renamings