Fixed cpplint issues