Mainly cleaning and commenting.