Clean solution (30/31)

Clean solution