clean up, fix name and description