* Completed component, some clean-up