Rename tenant to account.
More renaming.
Remove comments.
Fix indentation.