Cleaned up redrawing a bit