Whitespace and code format adjustments