Clean solution (1/31)

Clean solution