Improve of script