"cleaned up main"