refactor
loose ends