lint + remove name conflict
add comments