Cleanup and structure improvements of OTAccount.