Cleaned up walk