Small modifications according to review notes