small improvements in function name and imports