Composite Control
Minor cleanups only