removed unused lines
refined a var name
fixed a icon bug