Remove some spaces, move title check re-enabling to the correct place