Added 410 status, tidied up