Small refactors, string externalization.