Cleaned some codes
Merge branch 'master' of https://github.com/stratos-cartridge-store/Cartridge_Store