cleaning up class methods, date formatting
dates working and clean