More whitespace and attribute cleanup