model: reformat/refactor some code