Clean code
add comments