Cleaned up the Factories