Completed Part 3 clean up