bug fix and clean up
added class attribute and a date formatter