Cleaning up main()