Some main class cleanup