Refactor strings and labels