Generally cleaned and commented