Refactored code.  Rearranged code in Store function.