uniform comment style, fix a few space issues, address couple issues from comments...