Cleaning up sketch 2