refactored & cleaned up local symbol tables