#272 Moved logger out of super class due to confusing logging messages
Refactored wallet restore selection method to use switch for clarity
#272 Added preconditions and removed redundant code