Clean solution (11/31)

Clean solution