Start cleaning up of GUI code