clean and improved scripts