adjust to new whitespace guidelines