[Stable] Cleaned up main