merge,cleanup and added strictMode