rename functions
refine code