better style & wrap stuff for analyze