Made formating and style changes