css/js
refactor