User module related review comments changes