Cleaned up redraw