Updated addressing comments

- [x] Comments addressed
- [] Add details about clusterjs