Incorporating Siggi's feedback and changing comment style.