Cleaned up a few things in GUI class