basic idiomatic changes