Added string trim for date