more pattern added
Some formatting and comments