[issue #16][refactor] Refactored shadow matrices