formatting

remove some trailing whitespace
keep lines under 80 chars
@timestamp is unused outside its fuction