cleaning comments
remove unused variables
one click display and link