Refactored some String constants