Made the Main method simpler to test through a safe IDE refactoring