Cleaned up figures