Reflected review comments #111