make main a little cleaner