Corrected set_account logic
Collapsed a line in the Account class
Moved all unlock logic into unlock function