[EXT-116] Restore block mappings

Restored block mappings for the duplicate and missing data conditions.
Cleaned up some style violations.