More nitpicking + structuring with comments.
Add TODO.