Addressed reviews

5 jobs for main in 3 minutes and 17 seconds