cleanup and description update