slight component refactoring
slight component refactoring