wip: continue re-styling