refactor code and comments
refactor comments