Edward working on the clean up.
