Cleaned up my GUI classes