Removed SQL references, cleaned up, added toString.