Doing a bit of house cleaning, nothing major, doesn't change functionality