Refactored to remove duplicated code and cleaned up warnings for unused imports and deprecated methods.#770

kaikramer merged 1 commit intokaikramer:mainkaikramer/keystore-explorer:mainfrom

jonwltn:refactoringjonwltn/keystore-explorer:refactoringCopy head branch name to clipboard