Make small styling and symbol naming improvements