cleaned up main
reorg for main