Code review comments plus JSON decoder