- minor refactor to remove warnings.