Simplify main further