Implemented review comments.