clean code and add testThisScope file