strip values and format dates better