Cleaning up script a bit, moving machines