1. Code clean up, removed un-necessary files
2. enhance the function with testing parameter