Updated formatting as per guidelines