Review changes

- removed commented code
- simplified json file read
- replaced ' with "