some code cleanup from warnings as errors.