Made a few style changes