Cleanup up whitespace