cleaned up clause in main