Whitespace and small fix