Clean solution (17/31)

Clean solution