Refactorig Removing accents and temporal testing