Added some quotes and a little tidy up.