Refactoring: Move controls to the private section