Minor code updates from the review