Reindent code, improve comments, move huge nested methods out of classes,