M1453-ScriptRefactor: Implemented sugeetions in critics-review.