Implemented changes after review.