-Mild cleanup to Main.hs