xaml.presentation - inital code cleanup