refreshTenant() method added and whitespace tidying