Minor tweaks.
Move comments.