Replace getAccountManager().getStorage() with getAccountStorage()
Use local fields instead of getter calls