updated cv
refactor code