Nicer date format
Better coding style