Code clean up get rid of empy Date Label