Cleaned up models a little bit so that take advantage of pygsty tracking their existence