The Church: Defined and Refined