Code maintenance, resolving IDE warnings.
5 files changed