Updated eepDater with code clean ups