Refactor the setup