Thanks @wasade, completely missed this portion of duplicated code. I fixed it!

I'm assuming that you're not done with the review right?