A Little Housekeeping

Removed unnecessary comments, formatted all xaml files to be more
consistent and readable