Factor config
Clean up