Cleanup and rationalize factory