little cleanup of new hodor class