Formatting
Remove time functions, rename a few things