fix type and whitespace