Cleans up some code from xaml file and adds a couple comments