lint related cleanup, no code changed.