Clean solution (4/31)

Clean solution