Bug 905208 - Review suggestions implemented