Minor cleanup
Merge pull request #17 from pmorie/dev/cartridge_refactor

Minor cleanup