Edits to satisfy my 80-char line max fetish