added source code cleaning