Made a few basic changes to make the script better