Another round of heavy code inspection