Style updates

Further style refining.