Comments for speakers fragment and general tidy up of code