Improve comment
Remove unused variable
Remove duplicate comments