More cleanup, implemented converting gifs to gfycats