Strings cleanup and reorganization
Minor string edits