clean up & rename 'subunit' to 'council' for clarity