continued the great refactor