Refactor some String constants