got rid of helper; several renames; code cleaning