Made cosmetic changes based on IDEA code analyzer reports

Looks like the commit mess has been straightened out. I re-cloned and pushed my stuff before pulling the UI code branch. Just in case.