Refactor some stuff to display the next shape