I might as well clean #2