Tidy up some method headers