cpplint clean-up