Moved initialization to main()