de-harcode some things