*refactored some string references