refactoring, clear commenting
remove test files