style improvements (wip)