Add more comments and rearrange some of defvar placements