Chuntley cleaning up a bit.
Completed part 2