Refactor factor to get rid of errors

The way that factor loads is causing warnings around the "already
initialized constants" so this should eliminate that.