Fixing some spacing etc. to match Bill's code