Cursory cleanup :p.