Patch Set 4 + Minor clean-up