Clean solution (9/31)

Clean solution