Delete needless tests
Reduce indent