Formatting & better comments.
Start simplification.