Cleaning up sketch 7