Clean up a bit + add e621 handling

Add the e621 handler and clean up a bit in preparation for ~things~