Whitespace and small fixes