Move date-getter outside of class