cleaned up target machine creation