refactor
more commentary