Cleanign up main a little bit.