Tweak style for clarity
Extract AssociationBuilder class