some work on style