Clean solution (7/31)

Clean solution