improve naming, remove legacy code