Formatting/white space cleanups