Minor component refactor