An attempt to simplify some aspects of the composition.