Remove a debug print in the tests
Require all ifs and fors to have curlies
Fix a typo