Improved Program.cs