Minor refactor
Refactor a bit
Refactor, I don't care about l10n
Minor refactor
Minor refactor
Refactor, I don't care about l10n