Program.cs cleanup