refactor
refactor for js lint