Some cleaning & descriptions update