take a breath
refine code structure