Simplifies algorithm
Cleanup
Fixes test
Marks Appearance-Rules as used