Integrated: 8263159: Cleanup code based on review comments

[Jayathirth D V]

Code cleanup.

-------------

Commit messages:
 - 8263159: Cleanup code based on review comments

Changes: https://git.openjdk.java.net/lanai/pull/210/files
 Webrev: https://webrevs.openjdk.java.net/?repo=lanai&pr=210&range=00
  Issue: https://bugs.openjdk.java.net/browse/JDK-8263159
  Stats: 34 lines in 7 files changed: 10 ins; 17 del; 7 mod
  Patch: https://git.openjdk.java.net/lanai/pull/210.diff
  Fetch: git fetch https://git.openjdk.java.net/lanai pull/210/head:pull/210

PR: https://git.openjdk.java.net/lanai/pull/210