Cleaning up...

> use const where possible
> use LinkedValues instead of accessing Json values directly
> name refactoring