WAI-ARIA timer added and refactoring done