Coding Rule violations corrected.