Whitespace and stile fixes