More code duplication in Main

minimize and refine still duplicate quite a bit of code