Fixed up style and format