wording and cleanup