Some cleanup, standardizing context attribute, using ruby like syntax to describe relationships