refactor code
add more info