moved and cleaned up figures