Refactor: Eliminate unnecessary store