Fix some issues from golint (mainly commenting)