Address the comments made in the previous commit