Solutions cleaned and commented