Formatting

White-space clean up