date parse cleaned up