Fix to standarts and fix stores