Fix comments from Scrutinizer about symbols and stuff being in their own class