Improve description and details