switched to moment for date formating
cleaned up comments