Moderately cleaned and commented

Couple questions in comments.