Reformatted code to Community Edition code style
Worked on symbol referencing and renaming