Reworked some unnecessarily instantiable classes into static classes.