Make indent width consistent
Remove unused rules and add comments
Move a block of rules