Reduce code

Removed some useless brackets and short the date arrays