More code review from nim

Mostly naming and comments.