Refactor a few things

Trying to up the Code Climate GPA, which wasn't good after my last PR was merged, this should hopefully clean things up. Also added a couple of new stats to the `status` page.