Clean solution (6/31)

Clean solution