Clean solution (2/31)

Clean solution