- clean up main a lot