refactor some variable name, css selectors