trim() cleanup