Clean up configuration logic, more