Making the code cleaner

But for some reason the date doesn't work in MESS anymore.