Whitespace and caps fixes