Some whitespace and string cleanup