rename
fix
no leading underscore + cleanup
add test + ...
test