further refactoring of symbols