Damien - Minor refactor, move weekdays to global var.