Formatting changes as per the review suggestions