A little bit of cleanup. Preparing to add the ability to open multiple files
and switch between them with a popover window. Need a button first.