Made final style changes