Sam Jaffe 853a445a3f refactor: minor cleanups 1 rok temu
..
jvalidate 853a445a3f refactor: minor cleanups 1 rok temu