Standardize on two space indent. Delete trailing whitespace.