Approve cpplint

except #include <algorithm> (which is not nessesary)
Fix typo

this commit is unconcerned from current branch,
but it's too trivial to make a topic branch.