refactor h-dexter
refactor visibility