Cleaned up store some