cleaning up after refactor