ENH:  Better naming/organization.