simplify flow, style