Clean solution (21/31)

Clean solution