Minor code cleanups
Some checks are pending
Build jar / build (pull_request) Blocked by required conditions