Cleaned up guicore more