Formatting, added Date extensions