Refactord to a control facade