Formatting udpated