Refactor Component a bit.