Clean solution (19/31)

Clean solution