Some minor fixes: comments, typos, redundant code removal.