Clean software code
Coding standard: fix high priority of CheckStyle Result