Code Cleanups. Added XAML