Small refactoring
Removed need of data in code behind by creating an behavior