Refactor to decrease String usage in code