refactor more changes re components extract