removed some unnecessary BlockStmt nesting