simplify Main
improve results