Red green refactor