Improve code on EBDateTime