Revert "Code clean up for the core langauge"
Merge pull request #2080 from DynamoDS/revert-2078-code_cleanup

Revert "Code clean up for the core langauge"