Moving date out
Cleaning things up