style changes and additions