Small refactor of Cartridge model