figures cleaned up