Tidy up feature wording
Rearrange factory definitions for consistency
less hard coding