Issues #154 #155

* Also some CS fixes
Merge pull request #156 from elcodi/feature/cart-coupon-services-improvements

Issues #154 #155