Remove "that", fix bugs