more cleanup, added formatted date