String and line delimitation cleanup