A bit of refactoring to clear warnings

A bit of refactoring to clear the warnings.

Author: lhunker