More variable names and types