- Some cleanup on Program.cs