refactoring: clean up MoxyData usage