refactor one-line-group