Factor out style
Factor out js
Renamings