code cleanup and new text
Merge remote-tracking branch 'origin'