style fixes -- back to church and state