Use the pattern instead of name/comment if they are empty.
Remove outcommented code and fix up some comments.