Refactoring
Respect usercontrol pattern