Hardending/issue297

### Description
Changed all occurrences of Leaf and Struct to String and Object respectively
This is only a cosmetic change in the source code. No functionality is changed.