Fixed string finding + cleanup