Neaten some classes, improve comments.