Tidy up name + description