Refactor and Red for fixing that customer list holds state