Final clean up

Added Plot 4 and cleaned up the rest