Clean up whitespace mess