RANGER-1603: Code improvement as recommended by good coding practices
2 files changed