refactor/clean up pt 2