Simplify desc
Remove comment
remove comment
renamings
fix setup