Resorted rules and adds comments.

[kylebgorman]

This is basically function-neutral (and all the tests pass) but groups the rules slightly more logically in my opinion.