Coding rule violations corrected.