clean up based on the feedback from workshop