Cleaning up and splitting modifiers from rules
Merge pull request #9 from fidian/master

Just evolving my code a little