Cleaning up sketch 8