Code review changes

I have already stated that these were from abi's branch :)