Use four-space indent and remove trailing whitespace