Changes to comply with Coding Standards.