Updates for Minor issues in cart, updated code as per coding standards