Cleaned up the factories