Refactor of MainWindow class

Remove commented out code
Restore proper C# method naming convention