More slight refactors
More slight refactors

aoimedia/grunticon,filamentgroup/grunticon,danigirl329/grunticon,ebsco/grunticon,danigirl329/grunticon,ebsco/grunticon,bluespore/grunticon,filamentgroup/grunticon,aoimedia/grunticon,4nd3rs/grunticon,bluespore/grunticon