Standardized the script a bit