Cleaned up the add store stuff a bit