Add comments and pass golint