chg: dev: tidy @minor
Chg: Dev: refactor jsonify of ANM closes gh-201