#2 Refactored Strings from Java classes