simplify and refactor them
simplify and refactor them