Clean up, filename changes

Cleaned up formatting.
Altered timestamp for filenames.