Minor cleanup
Re-arranged the basket location