Code maintenance, resolving IDE warnings.
8 files changed