Refactoring: Fix some SonarQube issues#1017

stleary merged 8 commits into

stleary:masterstleary/JSON-java:masterfrom

Md-Yasir:enhancement/refactorsMd-Yasir/JSON-java:enhancement/refactorsCopy head branch name to clipboard