Fixed versions
Using ->format()
Cleanup