Fixed Date formatting
Removed unnecessary debug loggers
Minor implementation changes/refactors