Moving deadline class extraction to helper
Correcting calls to language strings