Additional work on style