more cleanup work on the styling