[Kerry] refactor code & clean model data