Cleaning up my own script a little.