Update feature names, fix whitespace