Changing format to better comply to style guides.