New files
Show time
Some style
Refactor