slight component refactor.