whitespace and naming cleanups