eaternity cleaned up