continues further work to cleanup after refactor