Can now return a spec file and did some cleanup too