More whitespace and cleanup to match source