deleted old content + refactored trim