Updated code based on coding review, commiting changes for further review.