Clarifing comments and whitespace
Added additional node matchers
Additional comments and assertions
Reordered method parameters