Made cpplint, doxygen happy