Time and Formatting

Improved the formatting of the thing