refoctoring
refactor code