tiny data refactor