Updated formatting issues