Removed unnecessary Symbol classes
Refactoring, better naming