Refactor Multi-part Component