Clean solution (12/31)

Clean solution