Clean solution (8/31)

Clean solution