cleaning up my parsing into models