Refractoring on behaviour definitions.