Fixed some cpplint warnings