Implement CodeReview comments
Minor formatting changes