Refactorings to use more features from Catel (== less code to write / maintain)