- Remove additional var references
- day is now date