Cleanup XAML code