Minor refactor. Cleared out TODO messages for work already done.
Minor tenancy fix.