[samjsharpe] Add private-utils
[samjsharpe] refactor slightly