Cleaned up the code

5 jobs for master in 2 minutes and 34 seconds (queued for 4 seconds)