Whitespace and speed fixes