Add filtering of data by year, month and day
Clean up and PEP8